Fix mysql connection check for multi-process docker image

Fixes #1241

Dominik Sander 9 years ago
parent
commit
d57ca61026
1 changed files with 1 additions and 1 deletions
  1. 1 1
      docker/multi-process/scripts/init

+ 1 - 1
docker/multi-process/scripts/init

@@ -118,7 +118,7 @@ EOF
118 118
 
119 119
   # wait for mysql server to start (max 120 seconds)
120 120
   timeout=120
121
-  while ! mysqladmin -u root status >/dev/null 2>&1
121
+  while ! mysqladmin -u root status >/dev/null 2>&1 && ! mysqladmin -u root --password=\${DATABASE_PASSWORD} status >/dev/null 2>&1
122 122
   do
123 123
     (( timeout = timeout - 1 ))
124 124
     if [ \$timeout -eq 0 ]; then